Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 17:37:38 +0000 (10:37 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 17:37:38 +0000 (10:37 -0700)
commit5d61e48b6882f975a7bd96a7f640c5118beb4915
tree4a9de9dc6ac040f44f80ffea6f7972365af37056
parent9f082eb3f40d29334216ac3ef7d37d75e72b2960
parentb31a7273088042ad05c3fab94a7e1f01217bbff5
Merge from trunk.